From f1392527829fe57e39b9048c749258a65af023cd Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Mon, 27 Aug 2012 16:47:58 +0000 Subject: [PATCH] split-binfilters-and-evo Gbp-Pq: Name split-binfilters-and-evo.diff --- postprocess/packcomponents/makefile.mk | 57 ++++++++++++++++++---- postprocess/packregistry/makefile.mk | 5 +- postprocess/prj/d.lst | 3 ++ scp2/source/binfilter/file_binfilter.scp | 12 +++++ scp2/source/binfilter/module_binfilter.scp | 2 + scp2/source/gnome/module_gnome.scp | 1 + scp2/source/ooo/file_library_ooo.scp | 7 +++ 7 files changed, 75 insertions(+), 12 deletions(-) diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 09e296baf17..69eabd77624 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -304,12 +304,6 @@ my_components += \ component/wizards/com/sun/star/wizards/web/web .END -.IF "$(WITH_BINFILTER)" != "NO" -my_components += \ - bf_migratefilter \ - bindet -.END - .IF "$(WITH_LDAP)" == "YES" my_components += component/extensions/source/config/ldap/ldapbe2 .END @@ -395,10 +389,6 @@ my_components += component/connectivity/source/drivers/mozab/bootstrap/mozbootst my_components += component/shell/source/cmdmail/cmdmail .END -.IF "$(OS)" != "WNT" && "$(ENABLE_EVOAB2)" != "" -my_components += component/connectivity/source/drivers/evoab2/evoab -.END - .IF "$(OS)" != "WNT" && "$(ENABLE_GSTREAMER)" != "" my_components += component/avmedia/source/gstreamer/avmediagstreamer .END @@ -450,3 +440,50 @@ $(MISC)/scriptproviderforjavascript.input : makefile.mk 'component/scripting/java/ScriptProviderForJavaScript.component' \ > $@ .END + +.IF "$(WITH_BINFILTER)" == "YES" +ALLTAR: $(MISC)/bf_migratefilter.rdb $(MISC)/bindet.rdb + +$(MISC)/bf_migratefilter.rdb .ERRREMOVE : \ + $(SOLARENV)/bin/packcomponents.xslt \ + $(MISC)/bf_migratefilter.input \ + $(SOLARXMLDIR)/bf_migratefilter.component + $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \ + $(SOLARENV)/bin/packcomponents.xslt \ + $(MISC)/bf_migratefilter.input + +$(MISC)/bindet.rdb .ERRREMOVE : \ + $(SOLARENV)/bin/packcomponents.xslt \ + $(MISC)/bindet.input \ + $(SOLARXMLDIR)/bindet.component + $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \ + $(SOLARENV)/bin/packcomponents.xslt \ + $(MISC)/bindet.input + +$(MISC)/bf_migratefilter.input : makefile.mk + echo \ + 'bf_migratefilter.component' \ + > $@ + +$(MISC)/bindet.input : makefile.mk + echo \ + 'bindet.component' \ + > $@ +.END + +.IF "$(ENABLE_EVOAB2)" == "YES" +ALLTAR : $(MISC)/evoab.rdb + +$(MISC)/evoab.rdb .ERRREMOVE : \ + $(SOLARENV)/bin/packcomponents.xslt \ + $(MISC)/evoab.input \ + $(SOLARXMLDIR)/evoab.component + $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \ + $(SOLARENV)/bin/packcomponents.xslt \ + $(MISC)/evoab.input + +$(MISC)/evoab.input : makefile.mk + echo \ + 'evoab.component' \ + > $@ +.END diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index 2d1d396890b..f69f6ce80cd 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -41,6 +41,7 @@ MY_XCDS = \ $(MISC)/ctl.xcd \ $(MISC)/ctlseqcheck.xcd \ $(MISC)/draw.xcd \ + $(MISC)/evoab.xcd \ $(MISC)/graphicfilter.xcd \ $(MISC)/impress.xcd \ $(MISC)/korea.xcd \ @@ -329,8 +330,8 @@ MY_DRIVERS += ado ERROR : unknown-GUIBASE .END .IF "$(ENABLE_EVOAB2)" == "TRUE" -MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu -MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu +MY_FILES_evoab += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu +MY_FILES_evoab += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu MY_DRIVERS += evoab .END .IF "$(SOLAR_JAVA)" == "TRUE" diff --git a/postprocess/prj/d.lst b/postprocess/prj/d.lst index f6be8cf864a..3ca3f6c52c2 100644 --- a/postprocess/prj/d.lst +++ b/postprocess/prj/d.lst @@ -4,4 +4,7 @@ mkdir: %_DEST%\xml\ooo ..\%__SRC%\misc\lang\*.xcd %_DEST%\xml\ ..\%__SRC%\misc\scriptproviderforbeanshell.rdb %_DEST%\xml\scriptproviderforbeanshell.rdb ..\%__SRC%\misc\scriptproviderforjavascript.rdb %_DEST%\xml\scriptproviderforjavascript.rdb +..\%__SRC%\misc\bf_migratefilter.rdb %_DEST%\xml\bf_migratefilter.rdb +..\%__SRC%\misc\bindet.rdb %_DEST%\xml\bindet.rdb +..\%__SRC%\misc\evoab.rdb %_DEST%\xml\evoab.rdb ..\%__SRC%\misc\services.rdb %_DEST%\xml\services.rdb diff --git a/scp2/source/binfilter/file_binfilter.scp b/scp2/source/binfilter/file_binfilter.scp index 538d1a25e31..0733e2135f0 100644 --- a/scp2/source/binfilter/file_binfilter.scp +++ b/scp2/source/binfilter/file_binfilter.scp @@ -42,7 +42,19 @@ File gid_Starregistry_Legacy_Binfilters_Rdb Styles = (PACKED); End +File gid_File_Rdb_Bf_Migratefilter + TXT_FILE_BODY; + Name = "bf_migratefilter.rdb"; + Dir = gid_Brand_Dir_Program_Services; + Styles = (PACKED); +End +File gid_File_Rdb_Bindet + TXT_FILE_BODY; + Name = "bindet.rdb"; + Dir = gid_Brand_Dir_Program_Services; + Styles = (PACKED); +End STD_LIB_FILE( gid_File_Lib_Bf_Go, bf_go) STD_LIB_FILE( gid_File_Lib_Bf_Sch, bf_sch) diff --git a/scp2/source/binfilter/module_binfilter.scp b/scp2/source/binfilter/module_binfilter.scp index 873652e6e16..fc6ae84edf0 100644 --- a/scp2/source/binfilter/module_binfilter.scp +++ b/scp2/source/binfilter/module_binfilter.scp @@ -53,7 +53,9 @@ Module gid_Module_Optional_Binfilter gid_File_Lib_Bf_Wrapper, gid_File_Lib_Legacy_Binfilters, gid_File_Lib_Bf_Migratefilter, + gid_File_Rdb_Bf_Migratefilter, gid_File_Lib_Bindet, + gid_File_Rdb_Bindet, gid_File_Res_Bf_Sch, gid_File_Res_Bf_Svx, gid_File_Res_Bf_Svt, diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp index 88a2926bab9..add5240a40c 100644 --- a/scp2/source/gnome/module_gnome.scp +++ b/scp2/source/gnome/module_gnome.scp @@ -42,6 +42,7 @@ Module gid_Module_Optional_Gnome #endif Files = ( gid_File_Lib_Evoab, + gid_File_Share_Registry_Evoab_Xcd, gid_File_Lib_Fps_Gnome, gid_File_Lib_Vclplug_Gtk, #ifdef ENABLE_GTK3 diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 6e5ec3f02d6..060dbd143a4 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -473,6 +473,13 @@ End STD_LIB_FILE( gid_File_Lib_Evoab , evoab) +File gid_File_Share_Registry_Evoab_Xcd + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Brand_Dir_Share_Registry; + Name = "evoab.xcd"; +End + #endif // #ifdef ENABLE_EVOAB2 #endif // #ifdef UNX -- 2.30.2